Changed output and added table2