updated and changed stuff around