Commit nr 1.5 of assignment1