Revert "event + vip +fix"

This reverts commit ff6882f155a3700feac49e48b842577636f8ad2e.
Revert "Revert "event + vip +fix""

This reverts commit aee0a2f9dd522aec4cd24c6083d1f13cc7807918.