Updated with nightly thoughts