Added initial design changes (lecture 6).