think problem with divergences/dropped segments is fixed