Made some adjustments