Final(ish) tweak
More tweaks, LB