restored set/track picker
merge