closing issues: 5, 36, 42, 46, 53