Final commit, added comments