Adding optional re-entry