simplified the way validation is done (hopefuly)
2 files changed