Removed Stuff, Added functionality
The rest