As a temporary hack, added activation events to remove need for manual activation.