Re-add failsafe protections
Added a nice demo page