notebook / shock / oauth update - round 2