Adopted Paul Hoffman feedback