Updated based on comments