moved defines to call