constants redesign