Boeing is hoping that new battery enclosures and other upgrades will pass Federal Aviation Administration(FAA) tests. If they do, the high-tech jets could be cleared for flight as earlier as next month, Bloomberg notes.

A company executive said it was “reasonable” to predict that Dreamliners were be back in service in “weeks, not months.” He noted that if the company missed that estimate, it would not be by a significant amount of time.