OutputFlush moved to a separate branch