use the define that works vs the documented one; put all in same place