changes for remote server environment