added exit and entrance, not active
Xcode
Merge branch 'master' into Xcode