Didn't you refactor this & the next?