I think the way it was is still correct.