moving to structure suggested in #4