minor changes to follow new structure