More updated comments