Interim checkin with significant restructuring