demo01 cleaned and comments