Initial exit re-write