A little bit improvement