Valdation changes 7