finalized version 0.6