comment out old code
add debug mode