changes for new spindle safety