final commits for Oct 18