made some defines to match specs