Almost there. One last round of feedback changes