moved next/prev here from track partial