restructured, fixed activation hook
restructured, fixed activation hook