Lot of changes and updates