Change to include exit into rendering