fixed some issues in order
changed order