Revised based on comments