moved over to simpler implementation, which also covers any previous changes not only pending