Update based on Feedback from Development