Added frequency checks and adjustments