lots of adjustments for world changes