Implemented op01, moved some #undefs