improvements to activate event
more activate event improvemnts