Adding changes from group code review