added adsr, and extra options