Additional changes and clear code #2.