updated structure for tomorrow