reverted to using constants