New code for comments