added d3-s5 stuff