A working version for the demo