getting rid of 'or' in 'match'
merged w/ master