Nice change. Do we still need this method? Can we convert the other uses as well?