v1.5 Demo changes - completion