made some more changes to validation