Final changes for demo