Dayton's suggestion + Added constants