final commit, everything included