brandon_r7: restructured4