Crystal/Goal fix Done.