0.6.0 + nasa changes