Lot of upgrade and cleaning