second commit, some changes made