final commit before seom UI glitches