moving to more constants