new requirements
nr 1
after merging
master changes
after merging