A little bit improvements