Re-ordered code.