rename wrapper class; add DEBUG_ENTER