Update per review from Aaron