Resolve issues 5, 6, and 9