Updated for BlackArch use