switch number constants to real constants like a good project