reconciling this branch with PR-97