Updated structure - not sure if this is going to work.