Added flush calls