Added locks to tracker