took out some defines