final commit for version 1