modified Client files