-play improvements