update demos with using new class