Main Changes:

	-Replaced all of the constants with function calls.