rotated and adjusted
adding stl changes as well