merged my changes with professor Flynn's