Made a better path, so that the validation routine didn't need to worry abotu case