adding in_active events support
merging the changes