Improvements to Yampa version