validator added
validator fixes