changed some stuffs