Commit from lab 20 June