Split on pois too, update track