updates to resolve issue 58