Added the rotation fix we talked about, but we may or may not want to use it