change order
new order & fix bugs