Third Commit, repaired