Moved the flat file loading around.