Modificaiton of demo view