Update Debugging code
Change code scheme