I would have separated the logic check of Raw but whatever