Still trying to get the timing right on the checking for tuned