Added rebirth location handling