added all features except resend activation