trying to fix manager layer
More fixes....