Adapting tunisia module (WIP)