improve assist and repair behaviour