Adding LBNL and UCSC customizations