Improving Track availability