Changed line 23 from 'or' to 'and'