Working with microsecond overlap
some small changes