preliminary work for import #16