Changes from discussion