3rd commit - edited comments