first commit, with my changes