Changes from Adam's feedback