Updates to scheme to hopefully attach to simulator.