need to fix timer and scheduler