Adding back in some schemes I forgot