moving to live fire update from tracker in master