edited copy, enabled comments