Updated scheme. Not sure if it will make a difference.