changed things to constants