update after 29.08 workshop