FLIGHT-1549 | Machine Design