Modified some code.