change some stuff from d to s