Fixing Structure, Added TODO