A lot of different changes and additions