Re-structure for guests