Added exit feature