This looks slightly better... will still have to play around with it.