Added exit and entrance