Added a debug mode to verify