so close but need to change some ids