commenting capability added