brandon_r7: restructured3