Restructured generator steps