More work on Manager