update for server compatibility