Changed some scheme stuff