integrate professor's modifications