Get it working properly finally
Fix demo