most recent changes, diff for shiira2