[@Raddum] Hmm, fair enough. I made a few alterations which I had considered earlier, what do you think of this?