Revert "Revert "Amended frequency selection""

This reverts commit e42edad16fc68c9f1d338c9440661a7b8e9a1fb2.