moved some defines