Fix settings
Update demo