Added auto-calculation for track and added track