Lab2 second commit