Changed Some Functions, Added Some