Migrating to latest/greatest TOP PAG stuff