more work, but server upgrade has made it worse