swift stuff
dssat swift improvement