Adding checking for value in row and value in col