Revamped demo modules