add validation back in