Neil's updates for figure-book integration