Removed historical code, Added more contextual information