Modified Basic Demo to make them function properly