added return true on events