rm @or, added @when instead