merging with latest version of osens (renamed)