Finish up first-round implementation.