changes to stuffs (I don't remember...)