Final commit for version 1