Replaced Constants with constants