final commit, tests ready