add 09
add conditionals