Updated based on wchen-r7 feedback.