refactor to use Flight (by Twitter)