1 13 cleanup

worked before because it was added to the base class.  now it needs to be where it's called.