3rd commit, minor changes