Updated local changes during last lab