Boeing hopes to be nearing the end of the controversy surrounding its 737 Max after two crashes in several months brought the company under fire for faulty software.

The aviation giant released a statement last week indicating the software problems that apparently caused the crashes have been fixed. The incidents on Lion Air Flight 610 and Ethiopian Airlines Flight 302 occurred late last year and early this year.

Boeing is now in the process of working with the FAA to supply the proper certification documents and details to get the aircraft back in the air. Before the 737 Max can fly, it will need to undergo a certification flight and supply the FAA with final certification documents.

“With safety as our clear priority, we have completed all of the engineering test flights for the software update and are preparing for the final certification flight,” said Dennis Muilenburg, president and CEO, Boeing. “We’re committed to providing the FAA and global regulators all the information they need, and to getting it right. We’re making clear and steady progress and are confident that the 737 MAX with updated MCAS software will be one of the safest airplanes ever to fly. The accidents have only intensified our commitment to our values, including safety, quality and integrity, because we know lives depend on what we do.”

In addition to the software updates, Boeing developed advanced training resources to facilitate the aircraft returning to service.

According to reporting by The Seattle Times, the FAA does not have an official timetable for the return of the 737 Max to service.

“It takes as long as it takes,” said Dan Elwell, acting FAA Administrator, at a speech reported by The Seattle Times. “The 737 MAX will fly again when we have gone through all of the necessary analysis to determine that it is safe to do so.”

Will you fly on the 737 MAX planes once the grounding order is lifted? Tell us. Email us at letters@globaltravelerusa.com. Please include your full name and location.