changed editActivity, etc