Made entry and exit points separate