validation and another changes