Update from "1st Submission" feedback