Good call :)  I need to adapt this to the new base class.