Final commit: added comments