More tweaking. Still not happy with it :-1: