Updated the demo. Removed the page timeout in favor of using error codes instead