try fixing timer
fixed delay timer issues after merge