Improved the standalone demo