Think I've done a better job this time. Will check when it all cools down.