Modifications to work on WolfPack