Lot of changes made