Files up-to-date as of lecture 6