Committing changes made during lab1 upgrades