Final commit before beta-testing