Finish initial version