implemented better track evaluation