Adjusted mapping, correct facing direction