Large rewrite of internal positioning system