incorporated alan's feedback