Change structure a bit.