Reworked based on the feedback.