replaced ints with class consts