updated to reflect merge 673aad4