Finish up until 9.3.2