Now making sure that overlapping entries are handled correctly