Re-added more comprehensive demo