Improvements
Try to make it find the file in subdirectories
and update theclient