Overall structure updated.