Updated the code, Added new activities