updates based on comments