after lecture 7
merged