Update: dev-demos/02 some improvements on common functions.