add rawdata
modularize
activity -> activityName