Tweaked the design for the manager a little bit