Improvement zwave sync