updated track; tests