Added flush empty row methods and flag