Work in progress number two - a little more tweaking ..