time ranges now correct