CS + minor change on file lookup