Made Yuan validation changes.