Adding the buffer override to allow direct motion control