small changes
fully functional version except import/export