Updated demo and comments