Fixed Demo 1 codebase