included some external modules to make merge easier (theory)