updates to resolve issue 85