Updated
Updated Witch Hunt
Fixed merge