Rewrite of Demo app