take out MY_HACK (test code)