Changed the title, updated comments