demo 1  please merge my code to dev