more scheme updates