Proper maping really ended this time