Re-arranged diagram