Made the requested adjustments