change demo to new interfaces