Final Commit with added comments