Tweaked code. Just pushing this up to pull down on another machine.