minor changes, added WM to structural analysis