Better flight, moving values to Reference class