Updated demo, restyled the class