update for joshuatrii