move comments up to add_debug