Split off .rotor from .buffering