Better way to update