edited joined.html