Just the way it was before, one function call instead of two.