Final commit, version 1