Some code commented and updated. No changes