fixed bug from my last emrge conflict, I messed it up.  I'm so sorry but it's better now.