final commit, things should work