second commit, with added comments