Updated track loading