I took the liberty to make some adjustments