changed  a few things