changes to support working with yo