Incorporated the suggested changes