done some adjustments