changed constants to be an object, rather than a key value