Update for higer performance