Modified some procedures.