Defines Update

Now using Zupa's Defines