minor changes to structure.