changes made according to LWG