bigger improvements on validation