updates to resolve issues 67