Greyna/comments edition