import ondemand actually working well now