Movement values are now mapped correctly