Second Commit (edited source code)