We discussed offline about how this could be re-factored a bit.