Feedback from BC added. Great work