Few  improvements