Revised final after comments