Pass two restructuring