#3 code clean for demo page
#3 code clean for demo page