more updates to frequency handling