restructured and lots of adjustments