serverside-only adding back