change constants to use enumerator