checkout my changes

should be 2 commits