Made changes off Lawson's feedback