removed playsets, added some optimization