Modified as per review and feedback.