finish switching to .or (closes #71 properly this time)