changed some utility stuffs