Added witches and more NEED TO FIX