Added tracking, some optimisation updates