Incorporate Feedback from @msohn