> @cpelley you seem to only have picked up on one point that I raised with my previously suggested refactor i.e. making sure to copy the coordinate.

You're correct, sorry I missed that when I was making the changes, I was back and fourth between reviewing and developing multiple tickets :)