Start applying our new constants