Not sure if we really need this new method here, I would keep only the previous one.