Changed name, cleaned up demo