reverted some lines needed