Make it work for both single & 2 cols