added Comment functionality