mirror develop bug fix so baddies dont have to merge