added lots of consts