Some changes made during class. Hopefully nothing is broken