Improve sorting and allow for track updating