Added condition for no tracks