more tweaks - not sure if I'm on the right track though...