Mod CompleteActivity and so on