Lot of stuff modified