changes some bugs