Added  alittle bit performanve improving