Class updated with comments