Committing after the final changes
Added more description to the comments