Updates by Clay and Tyler.