Update: refractoring