change some stuff around