Update Encoder Wait to prevent Death
Merge