Rotation still incorrect, but getting closer