fixed unique_start and unique_end (for real this time)