refactored with mary/austen