This looks pretty good, I will check further later.