fixed a bug, and did perestroika on the order