Made some revisions based on Jack's feedback