took out MY_HACK; ready for testing