Slightly changed some stuffs