OK back to the mapping I had. Works better for me