demo/dump enhanced