Resolve issues 5 6