getting rid of defines wip