Changing the structure around a little.