Maded some adjustments