Updated few bug