Adding activation and user control