Thoughtful changes from Marc