further mods to commonManager