some changes that are related to validation