Update & restructuring.