fix custom events and descrease tmpler