minor changes to structure