Improve asma
Finish asma