improve code
improve AISI standard