mapping accounts for pitch and roll correctly