update to current Joe's webrev