LB: More adjustments, ready for review