More comments added, no code changes
Final commit before submission