Change the processing of UserActivity. closed #28