lots of modifier optimizations and adjustments