Added more sections and comments