updates motivated by calpaper