need to change something before moving to cobi -- revert