Added seperate rows and columns