edit for version .18, plus fix sync timer bug