Big changes wrt times/frequency handling