added some more condition checking for column