A lot of stuff modified and more