Absolutely - I wasn't sure why the anonymous functions were there, so thought I'd leave them be.  I'll change that.