Adding validation back