AOI: v0.6.13

Optimize the experience