WIP changes for managin center for #8