updates, with improved proxy