more scheme changes