Change according to refractored code.
Commit.