updated to use all available columns