update from s06 to s07