Better naming. Move the activity to be the first parameter