For my improved version; it hasn't been commented on. Sorry anyway.