Changing structure a little