Updated with the suggested changes.