optimizations, small adjustments to fit in LBT