Updated few things