Added waiting to connect and newer file format.