Added caching, Added calculation for discipline