Updated demo and contributions