Update (improve performance