Making some changes for activity flow