Update for sw 4.2