Updated ordering for better spacing