updated validation of location