Added base code for comments