nightly changes / jeff comments