Kali: Moved the ordering about