final commit, ready to merge