Change the way we catch columns