Still trying to fix timer