More structure... wipwipwip