small changes, Andy, just like you wanted ;)