Comments update for new behaviors.