rework
more mods to a unified pg