--- a/code_part1/OSTC_code_asm_part1/changelog.txt	Sun Nov 03 13:37:04 2013 +0100
+++ b/code_part1/OSTC_code_asm_part1/changelog.txt	Tue Nov 26 12:11:23 2013 +0100
@@ -4,6 +4,7 @@
 CHANGE: Remove CF55 from decolist
 TODO: show gas change stops different from decostops
 BUGFIX: FTTS>9min in OSTC 2C hardware
+NEW: Show the bailout list in surfacemode (CC Modes)
 
 New in 2.73:
 BETA Version - Do NOT use for diving

--- a/code_part1/OSTC_code_asm_part1/customview.asm	Sun Nov 03 13:37:04 2013 +0100
+++ b/code_part1/OSTC_code_asm_part1/customview.asm	Tue Nov 26 12:11:23 2013 +0100
@@ -397,7 +397,7 @@
 surfcustomview_toggle:
 	incf	menupos3,F			; Number of customview to show
 surfcustomview_toggle2:
-	movlw	d'4'				; Max number
+	movlw	d'6'				; Max number
 	cpfsgt	menupos3			; Max reached?
 	bra		surfcustomview_mask	; No, show
 	clrf	menupos3			; Reset to zero (Zero=no custom view)
@@ -409,13 +409,29 @@
 	dcfsnz	WREG,F
 	bra		surfcustomview_init_gaslist			; Show pre-dive gaslist/setpoint list
 	dcfsnz	WREG,F
-	bra		surfcustomview_init_interval; Show the interval counter
+	bra		surfcustomview_init_interval        ; Show the interval counter
+	dcfsnz	WREG,F
+	bra		surfcustomview_init_cfview			; Show important CF settings
 	dcfsnz	WREG,F
-	bra		surfcustomview_init_cfview			; Show the interval counter
+	bra		surfcustomview_init_first_bail		; Show the first bailout gas
+	dcfsnz	WREG,F
+	bra		surfcustomview_init_bailoutlist		; Show the bailout list
 
 surfcustomview_init_nocustomview:
 	bra		surfcustomview_toggle_exit	
 
+surfcustomview_init_first_bail:     		; Show the first bailout gas
+    btfss   FLAG_const_ppO2_mode            ; in ppO2 mode
+    bra		surfcustomview_toggle			; No, use next Customview!
+    call	DISP_bailoutgas                 ; Show the first bailout gas
+	bra		surfcustomview_toggle_exit
+
+surfcustomview_init_bailoutlist:            ; Show the bailout list
+    btfss   FLAG_const_ppO2_mode            ; in ppO2 mode
+    bra		surfcustomview_toggle			; No, use next Customview!
+    call	DISP_bailoutlist                ; Show the Bailout list
+	bra		surfcustomview_toggle_exit
+
 surfcustomview_init_graphs:
 	btfsc	no_deco_customviews				; no-deco-mode-flag = 1
 	bra		surfcustomview_toggle			; Yes, use next Customview!

--- a/code_part1/OSTC_code_asm_part1/outputs.asm	Sun Nov 03 13:37:04 2013 +0100
+++ b/code_part1/OSTC_code_asm_part1/outputs.asm	Tue Nov 26 12:11:23 2013 +0100
@@ -1393,6 +1393,38 @@
 	goto	DISP_set_color	            ; grey out inactive gases!
     ; return
 
+DISP_bailoutgas:        ; Show the first bailout gas
+	WIN_TOP		.25
+	WIN_LEFT	.90
+	WIN_FONT 	FT_SMALL
+	WIN_INVERT	.0					; Init new Wordprocessor
+	call	DISP_standard_color
+    lfsr	FSR2,letter
+	OUTPUTTEXT	.137			; Bailout
+    call	word_processor
+	WIN_TOP		.50
+	WIN_LEFT	.90
+    bsf		leftbind
+    lfsr	FSR2,letter
+	STRCAT  TXT_G1_3
+	movlw   .6              ; Gas #1: %O2 - Set address in internal EEPROM
+    movwf   EEADR
+	call	read_eeprom		; get byte (stored in EEDATA)
+	movff	EEDATA,lo		; copy to lo
+	output_8				; outputs into Postinc2!
+	PUTC    '/'
+	movlw   .7              ; Gas #1: %He - Set address in internal EEPROM
+    movwf   EEADR
+	call	read_eeprom		; get byte (stored in EEDATA)
+	movff	EEDATA,lo		; copy to lo
+	output_8				; outputs into Postinc2!
+    bcf		leftbind
+    call	word_processor
+    return
+
+DISP_bailoutlist:       ; Show the bailout list:
+    bra     DISP_pre_dive_screen2
+
 ;-----------------------------------------------------------------------------
 ; Display Pre-Dive Screen