Updated for assignment 2 presentation.