v3.2 Timer fix, optimization