add or test and allow for comments