A bit improvements