incorporated some of Isaac's feedback