moar changes!  lots less text