add == 'yes' for comments and math