Add's feedback, changes plasma usage.