second commit, minor changes