Change some things to use the modified function.