improve lecture 2/4 and 2/5