added and changed stuff