new scheme fixes