Adding auto track option