More work done on Manager