Changed Defines to be more logical