Updated comments according to recent decision.