some trivial changes during class.