Comments editted