commit of verification long standing branch

it looks a little weird to me, but I guess it will be completely changed once you separate the ListUpdate out of it.