Change structure a little