Added lots of different changes