If this works correctly, could it work with the x-axis. That would remove quite some mapping functions with a /1000 in them.