Moved output flag to proper section