WIP: refactor: fixed global distro