changing some stuffs