Final changes to get a working demo...