Modifications to enable manual control