Some changes

Complete activities life cycle