Updated from feedback during class