commit from exercise 1