more ordering changes