made some adjustments