Improve yo events