removed direct calls to EXT
Merge branch 'devel'