Yep, that's much simpler.  Done.