Final commit after 09-18 office hour