changed to handle column