nice job Joshua, a vast improvement from what it was before