More updates based on comments.