updates to resolve issue 43