Updated scheme