Updated. Waiting for feedback.