Position time offset corrected and optimisations made