AMSJ » improve safety