IMPROVE: update to last externals api
temp preference refactoring