Last minute changes. Finished.
and xcode change states