Merging updates from professor's changes