Minor: extract version & ordrering