Rewriting for the new method