Final check and commit for version 2