Improved debuging: