Some changes in PlayNext logic