Added ability for more than 2 columns