Updated scrapbook to match rest of client code.