Added yoamisafe changes