Updated for Teran talk