First edit in dev branch.
After homework 6