Changed back to a working demo