minor changes to match course material