Litle improvements