Revert "Revert "Manager update""

This reverts commit 68fe3a81769daebf148fa715caa9ec8366910688.
pdb set

pdb set