Update for addressing review comments from wwitzel3