more robust worker and visor