Implemented automatic adding of tracking points