replaceing more constants