Incorporating Lynn Moore's feedback