Almost finished catching up with the new imperative method.