Start changes to receive comments for answer and other minor stuff