Updated for Alisa Craig project.