CR- change to Constants