12/8 updates after 3rd milestone feedbacks