Re-ordered and re-organized run-list to cooperate better with PG