Update features, break out activate feature