changed armory and fixed guiders