Re-add emitters and fix their lag issue