Upgraded scheme