Upgraded split version