Changed everything according to feedback.