Tweaked the code a little.