Debugging mode added