Added tracking to servo control