after adding validation