Improved structure #2