Refactor to use Thor not clamp