Fixed broken event system, now we use callafter