this is like my last pr but I tested everything.  SORRY!