import: fix some code for demo to customer;