Update for simplify code