Added settings and play until