Better happy path for activities