Aida/Yoda update for journal version