Did some adjustments