Second Commit, little changes