brandon_r7: restructured2