updates to resolve issues 70 74