modified some defines