Added notes in comments