tweaked in subsequent branch, not changed here