More work on proper ordering