Improved frequency finding