working on lecture 04
merge