Demo + other necessary changes