Ready for demo
Fixed Settings