Review based on comments