A little modify