integrating birdtracks better