[#55278456] made corrections per Dan's comments