move activity work into the activity