Re-arranged structure.