Finishing initial version