Completing initial version