before change to yaf