Modified Client files