Almost finish xiami part