Can we get rid of the `activity.activity` here ?