some adjustments to the dataSet class and table view has been integrated