fixing some bugs ...
updating order