Added and changed stuff